Revert "Modify the core to support removing the necessity of having role_org-application association"#5632