[Bug 1129830] TW update (<20190318) broke X completely