Revert "Support for basic composite resolving"

This reverts commit ca2c4ef0575c8bd90476dc338fb5a04df3c90fd2.