Re-add features of my modified 3.46.