Rolled back a couple of erroneous access scope changes.