fixup! HYDRA PICKUP...
drop! Revert "squash! HYDRA PICKUP..."

This reverts commit 00dd971c72c2bb7df38c68e97359a7490e2cce85.