Revert "Plunger tweaks"

This reverts commit 9d7a928ef81311a72176d3f48eac653ee4f89bf2.