We agreed this should only be done on non-root servers. Can you add the check? Also, when rebasing, please make sure this is inserted after the code that removes a trailing comma from the promises :)