Revert 57b129c..70f8d94

This rolls back to commit 57b129c310651bfbdcf55641b3f9206a7313d61b.