Revert 5c7c98f..773d78d

This rolls back to commit 5c7c98f01090b3144d5b3dc76291fc10ad4b0856.