Minor change to revert to the pre df7622c behavior (#401)