Revised backport logic due to 10.4 differences.