Another try 2 at fixing pimple conflict.