Revert "Remove unuseful things and add stamping"

This reverts commit ca5606932988cc0cf70556a2616bd0dc833e1257.