Revert d744510..820a234

This rolls back to commit d744510a678925312628ae2fddafc59ad8286606.
Revert 7a9c708..2869f35

This rolls back to commit 7a9c708bbfd65ef78d7c95035b8f503f8fcddc4f.