Revert

Commented out faulty code