the "fix" for 69243 is complete enough for now