Revert 3db14ff..05cd566

This rolls back to commit 3db14ffafaaec0987c6e96222faf6d75a0af88a4.