Revert "Merge branch 'new-pimple-version'"

This reverts commit 56999f8840f9c81c69ea75d4d476293bd67ded36, reversing
changes made to 9046ace5eb86811e143cf6fdbabba783fe4bc426.