Revert ef24dd3..511abc1

This rolls back to commit ef24dd3485741e4a1217c040e6f1944b769e30a9.