Revert 2a24346..25e0cf9

This rolls back to commit 2a24346750a7baf07840890e8779978bdef5d339.