Rebuilding on 3.1.2