Fix mis-merge of #589 from master