Revert 4cb16ae..38bcd78

This rolls back to commit 4cb16aec8c31eb9c96f0161d50ab16ca2edd2144.