Merge "Remove fix for a 5.3 problem"