Manipulator handles fix.
Revert "Manipulator handles fix."

This reverts commit 6cd817891d9ddab7715068943d8e795f59c75429.
Manipulator handles fix.