Revert c3ec24d..0bcf053

This rolls back to commit c3ec24de8e31ed1df5593b703f7da5db5652384d.
Revert 23d539e..7db9acc

This rolls back to commit 23d539ebd3c684c4c5b2579ef2b14b8cf00ff233.