Revert 8002468..81b27b2

This rolls back to commit 80024684660712963316485230c6a38ed38bd49b.