Revert 90df377..fe7b246

This rolls back to commit 90df377cd2db6ad8e19473ba4fd7e0dcb5defba2.
Revert fe7b246..a73fbce

This rolls back to commit fe7b24628a778d5ec7f3c51388df7f13ca5b1eb9.