revert fixes for sandbox