Add behaviour back for record-replay