Revert a2585f2..86170da

This rolls back to commit a2585f2969bd3a064913fc400b0ecb1ea1286011.