Revert 190ea18..7307dc6

This rolls back to commit 190ea189c4596b3aee2b7fbe57507e5b4d2858c7.