Comment # 14 on bug 87244 from Aleksander Morgado

Just for reference, I cherry-picked that fix for my 3.18.6 and I no longer get
the X stuck. Hoping it hits the stables soon...