Fixes: #2430 Collateral damage of user class migration