Revert d721851..3f16046

This rolls back to commit d7218514cdf4c20f4b6491f906ce961e2a34421b.