Revert d3daff8..af0ce45

This rolls back to commit d3daff892c7268862139a293da914a881777b190.