Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev