Revert e5c134b..bd04d24

This rolls back to commit e5c134b112d34cee288656e0507bdc0371dd8371.