Agreed. Changes made and moved to #5509.