Revert b24b0e3..f2ad9da

This rolls back to commit b24b0e35e41e614821d404a8998334aae2d94458.