Revert "Resolve merge conflicts of 91f2a6a to nyc-dev"

This reverts commit a37a38464aeef5ef2eee77b8463f975d6ffa34af, reversing
changes made to ef611642305d68e51a6dbe0e57052671c01f7c31.
8 files changed