Older version of #1028445