I'm not sure why we would need another PR as I was working on this issue...

I think @carlosantoniodasilva generally dislikes having `if current_adapter?()` statements (as do I). Let's see if we find a solution that does not require it.