hmmm - I dislike the change of a core function to fix behavior within one external system

@icewind1991 can you please comment on this? THX