Revert 64ef25c..0c43c8a

This rolls back to commit 64ef25cbcdbaaee936ae5c99f8f51f745d10cffc.
Revert 0c43c8a..4accf4d

This rolls back to commit 0c43c8a52b997a5d58c9fc2836f92a9517755fdf.