Revert 3ba0f51..7c56a50

This rolls back to commit 3ba0f51d800b152d804d8d4c389d392eece5c626.
Revert 6d580a3..27e23b7

This rolls back to commit 6d580a39a70afead2d19a806aa5d2b842df263db.