Another try 3 at fixing pimple conflict.