Bring the TAP formatter back into core.