Revert 6073945..ca43d5d

This rolls back to commit 6073945997f857d87690dbcbd90c11ca6ee460f2.