Fix commit 2a54b62caa6a5e67e5bcfcc00ee34cce503b3c31

Only for the 5.3.x reverts some changes which only apply to msater.