Revert 079060d..5fa512d

This rolls back to commit 079060d07698ccdd92b2921ddb2ab5185156ccaf.