Revert 968

This reverts PR #968, by request of QA (fixes bug https://bugs.launchpad.net/juju-core/+bug/1386766).  It is just a revert plus a tiny change to fix a test added after this change that became incompatible after the revert.