Revert loss of API Formatter in rUSH6b859b8f5004, refs T98