Is there an Issue filed to track the removal of this?