Revert b401a6b..2a8effb

This rolls back to commit b401a6bfb9e0b30dd338ee9fe6fd27968a2d376c.
Gah. Non-deterministic