Revert "Merging origin/bob/master-pending/include-resources-uid into master"

This reverts commit 1d42e403d99669992118e9640379eb015805685a, reversing
changes made to dbb346e4ed90056ce3a3e95362b472783bb42036.