Rework harden 3965

Please merge but do not close #3965 .