Restore v3.1 development...