Revert "Merge branch 'ClemMakesApps-master-patch-47845' into 'master'"

Why is this change being made?

This reverts the change introduced in !39846 (merged)

Discussion in !39846 (merged) shows that there are multiple ways of interpreting the change. In addition to that, even the directors commenting in the MR raised a couple of questions that were not addressed in the MR itself.

Does this MR meet the acceptance criteria?

Conformity

• Added description to this MR explaining the reasons for the proposed change, per say-why-not-just-what