Revert aba0751..cdb4116

This rolls back to commit aba0751876059939fbf3e9645d74e40cbabd7233.