Revert 8e80ed0..fe5811c

This rolls back to commit 8e80ed01016bbac192bdf25f4529cbbe22f5d932.