Merge "Don't need this "feature" any more." into nyc-dev