Revert "Merge branch 'os-boxes' into 4374"

This reverts commit 7239f045f2b4aed159b0bf8d05a929add00e43d9, reversing
changes made to 91ea099868fa066fc6cd2e428fe2531487a44cb7.
Change user-access per vsite.