Revert d862cf2..2a68ad2

This rolls back to commit d862cf2009e4c4957a62fae01d8ce54e5a1ba2a6.