Update to 3.6.0 from 3.5.4 breaks admin

Some new info here from the github issue for anyone wondering.