Revert 7bbc945..e75581d

This rolls back to commit 7bbc945058931ec331adca0f610b77fd26fda63c.