Revert b0a513b..6405d15

This rolls back to commit b0a513b4d0b46bd294cb8ab9f1ab3cbe8a176836.
Revert 5f72efe..31cf2cf

This rolls back to commit 5f72efece8ffb7676c75115159b4812686920f49.