Revert db47198..01de868

This rolls back to commit db47198131be2561dfaee55d9a2f4ebd92d58b30.
Revert 01de868..9ceb54a

This rolls back to commit 01de868174a66d8ca349a5c51c8240f62e48bf37.