Revert 1d6dd2c..748f580

This rolls back to commit 1d6dd2c2d4f375abf03bdfcb8eab433b7bc33374.