Fix #1661 : Use bin/setup for plugin manipulation to avoid plugin failures