Machado happy to re-join Rockets