Revert 42a5300..883642c

This rolls back to commit 42a5300354030e34e98b24b92ec2352950154e5b.
Revert 883642c..6c067c1

This rolls back to commit 883642c959569a963657d29c2997234a6c3076c8.