Revert fad3e34..3474870

This rolls back to commit fad3e34a53c860df6dc7eea9018b30aa483794ec.