Revert 808cca3..b3dd675

This rolls back to commit 808cca372be9b4d9064c5651cb3d4c385de40ad9.
Revert b3dd675..db3b55b

This rolls back to commit b3dd6755aed11d09de3f2b479e120c7f94abe285.