(#1010) - Switch where plugin registration happens