ZSS-253: can't resolve the focus from partner to non-partner issue now.
So, rollback the code.