Refs #8449 Revert changes
Merge branch 'feature/8449_sassena_stamp_removal' into develop