#126070 follow-up by David_Rothstein: Rollback of previous patch; needs discussion/deferrment until D8.