Revert accidentally committed r213459