Bug#921232: Tracking it down

[Joseph Shields]

This is fine in master, but I can repro it with an otherwise clean upstream git 
tag w/ our 4 s390x backports. Bisecting.