Oops, accidentally reverted r47053 in m last commit