Revert d65e87f..081a71a

This rolls back to commit d65e87febce396c1db89687eb5825c717c65e265.