Revert "Small Access Changes"

This reverts commit d7f819d5759357b915ceb171d723fda1f5e0c115.