Added TS-2684 properly, and cleanup the erronous addition.