Revert 18b34a2..34fd767

This rolls back to commit 18b34a28445ff8ffc58ec6d5523811b2dd1ee4bd.