Revert to 489fd7ae196517f1f9e86a6f736774aab5294f02 because these commits should have ended in the master