Revert ccaf227..71559fe

This rolls back to commit ccaf227dac8af9322dd9e018eb3ffd4b17fdc87e.