Revert 94be6d6..02bf8cf

This rolls back to commit 94be6d6b69121ebc8821d67632e723535b00961b.
Revert d309b63..b590ab4

This rolls back to commit d309b6326782d0d35bd74784313d01c1132b31be.