Revert "fix up ensure logic causing circular dependency"

This reverts commit 4b82f9e50a979a5bd699d44c8cbe8f97009de62b.
Revert "we should be able to specify ensure => latest"

This reverts commit 93a975ea0a0efa077e6db2b87493506e03ff9dab.