Revert b9a6623..c6a2385

This rolls back to commit b9a6623648f2eac2a6a495823e2bc467cfc0ee18.