Trying again on trac17272