Revert more changes for the 0.20 build