Revert 1a6a9f6..3b174d0

This rolls back to commit 1a6a9f62722022082675672fa2bbaa2ba755a4dc.