Revert "Get rid of the stamping stuff"

This reverts commit 92ecc074f781e21e2bb0413422e168cb7aa42247.