Revert 2a08399..d8ecc65

This rolls back to commit 2a08399fd2a15884d7138ee88d931f23a9069b04.
Made changes