Desktop: Is there a way to remove the 8867 on self-prepared return?