Revert 384a814..f5d7daf

This rolls back to commit 384a814f09b8c104ca25ff8d32bef99be39a7ec7.