Revert "Validate populate command more rigorously"

This reverts commit a81ebd8bf33a62d70aed06e92b09e724df8df216.
Correctly validate populate
Merge branch 'master' into develop