Apply fix to 5.5 and cleanup.