This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing changes made to 2511b0742a3695298d8216fe9723581c089909d7. Conflicts: lib/db/upgrade.php version.php