Reverted change from c5f348e due to #1471; this needs a re-visit