Revert aded91c..07b06f5

This rolls back to commit aded91c13c20fd75860635b341fa34c684778da1.