Revert 'Set various methods as properties'