Revert 5e885c1..0fc1f45

This rolls back to commit 5e885c1056f865274332aa82c30133ee65afef85.