Reverted to no handles