Revert 1598a36..244a1f9

This rolls back to commit 1598a368182ffb0302ab68257b52f2609ac82ecd.