Revert 347ad9e..9a959db

This rolls back to commit 347ad9e514ac8c1514c5b2e926d2b28824068e9d.