The fix that was applied for PR1224 stops the compiler