Revert 2c1553b..c98eaa1

This rolls back to commit 2c1553b14e7becc686ee0d09934856dfe1d38382.