Commit c224b2cf reverted the logic of this method so that parts of the application did not work properly anymore. This change brings back the original behavior. BUG: 396987 FIXED-IN: 5.0.2