Revert 8e80ed0..be57cd5

This rolls back to commit 8e80ed01016bbac192bdf25f4529cbbe22f5d932.