Revert 9cf1644..240f524

This rolls back to commit 9cf164410b8961eaaddd4114f21e0effadcbfbc3.
Revert 240f524..bd309c7

This rolls back to commit 240f5241e378adbbc6ebf7c914559653dc989a21.