Revert patch
Adressed neutron's comment