Another try 4 at fixing pimple conflict.