Revert "Get rid of the stamping stuff"

This reverts commit 9785f56613e7ca6a30fe24a77113f75040ef0ada.