Easy way to have both Public Schools and State Religion?

Hi, is there a way to have public schools AND state religion enacted at the same time in the current patch other than:

1. first passing freedom of conscience/separation/atheism
2. then passing the public schools
3. and then passing state religion again

Alternatively is there a mod that removes the limitation?

Muslim nations being able to have state religion and public schools and all others not is a bit ridiculous and doesn't event make sense. The two being independent as in the previous patches was better.