
This is causing some trouble with the integrated build. For now, while we work out the role's build/storage delegation, let's revert this. This reverts commit 975675b65949042ea7dea108294f0604fb37fd10, except for the a-r-r entry which is left in place as it will be needed later. Change-Id: I111baaf1e3d70c036508cccc31887e0f328a67ce