Rolling back to 2.9 to try to avpoid using plugman right now