Revert 3813f71..0ac2bd9

This rolls back to commit 3813f71e9790922edce5a1660a0f36c5c8931f1d.
Revert ff5ff09..cd296fd

This rolls back to commit ff5ff096bb723a9c0070852f428b6cb48f6d369a.