Revert 06709c6..86f576e

This rolls back to commit 06709c6ee43f43ca8527be00ef948f31e7d78892.