Revert 88d4cfd..7304f91

This rolls back to commit 88d4cfd79afa55e4d3cdb59bedd2195fdffe92a2.