Move to a more forward compatible approach.