Improved on previous commit: instead of changing the behaviour of the existing function (which might break existing samples and apps), add a second one for the behaviour we want, and have the original call this one (no code duplication).