The changes in this controller were necessary to support the approach described in the comment on variants_including_master_controller.rb