Merge "Clean-up a workaround that is no longer necessary." into nyc-dev