#1244902 (half of two part bug)