restore old values and mark it deprecated for 4.0