Undoing what I had done in these files, as both of those changes were accomplishable in Config.js without touching TAP core.