Work on 3.12.1-pre.