Fix setup so we don't cause a stackoverflow on 4.4+