Revert b26656c..1786165

This rolls back to commit b26656cfa7fd4c202623c772f6c28a9229c225c4.