Revert 10e51e5..bc0119f

This rolls back to commit 10e51e5482870756467acbf1484259f1b00acea2.