Comment From: philwebb

We may be able to revert commits d29444baf1a9447b6b123e1a7d3ebfcc7c5a9851 and 0b5ce952ba1ffb698199da5c66928761c2f3d023 when we do this upgrade.