Revert abfdfb4..46ba369

This rolls back to commit abfdfb4181c81f65baf1b2f05b2759c254021dc1.