Merge "Remove historical workarounds."