Revert 79665dc..1438683

This rolls back to commit 79665dc70f3f6331be368ad4835d9d5b5247894b.