reland safe changes from the issue