Revert 7d877fe..60d6350

This rolls back to commit 7d877fe9256da0f3cf6bcb177a2737f3a15ec9ea.