Moved the quirk code for the #556 fix to its quirk-specific file.