Back out 6650d6e112 merge of faulty ENG-4008 branch