Revert change regarding adapter not set problem