This is the quickest way until we get a proper Clear Track solution added to the OS.