See first failed attempt as solving this: !2 (merged)
BUG: 421329
FIXED-IN: 5.74
cc @mart @ngraham @apol