Revert "Remove unuseful things and add stamping"

This reverts commit 64bedecd95dbe158e41fedf8d53a544bd7ce7b29.