Revert "Pimple 1.x updates."

This reverts commit 1c955685f262bd24ebeb944af836b1f3b7c8923f.