Revert 4f3a361..891823f

This rolls back to commit 4f3a361e798af4954aaa92c63c80db0ddd9ae289.