Revert 108b21f..0bcbad3

This rolls back to commit 108b21f44b0858d9354e366a643ba1614202bf57.