ACCESS-54. Revert ACCESS-53