Partial rollback of x11 global shortcut manager code