Revert "resolve previous merge conflict; fix inter-package dependencies"; undo spurious indentation changes

This reverts commit b8d152b78b8b31b409772727cdb103f5f0eebe06.