Revert 8d65512..0ea6065

This rolls back to commit 8d6551299fed5c7f279f8803170a83c4ed190926.