Revert 43c1566..23a54b9

This rolls back to commit 43c1566e5a4ada7dbd9afee077e15baf1264b6c1.