Revert "Pop 'n lock"
Revert "Pop 'n lock"

This reverts commit 5910a3b3900e0cb554f2ce48d646200fc4cb03de.

Johnetordoff/waterbutler,felliott/waterbutler,RCOSDP/waterbutler,rdhyee/waterbutler,CenterForOpenScience/waterbutler,TomBaxter/waterbutler