There was no real reason to use/cleanup/x11-alterator downstream
every time instead of promoting it upstream to the common point.