ebc20f6000
This commit partially reverts c707948105
refs: #4849, #4973
Change-Id: I1063e5de2c0e3c90971c4ae006ce46de386c2ed0