Added 3.4.3 preprocessor checks to avoid reverting changes repeatedly when running CE 3.4.3.