Revert 8d91036..a713af7

This rolls back to commit 8d91036e5ffee80850799833784126da6e47b7b2.