Revert "NYC Update - Trying TO undo"

This reverts commit 465a245220cae6df56d60dfb5880f21fee107706.
Revert b838037..84df69f

This rolls back to commit b83803707f78f3bd9663b732da0c3d93a4be640b.