Important changes missing from a1366a4.