This reverts commit e546e4dc. It's causing problems because bindir and sbindir are in the wrong order for a user session.