This is a proposed change that I just added