This reverts commit f5b28201fee88ed1bd00782c82925bf2cb09d1a5, reversing changes made to d9e9fb22068f463c8e85f710ec2114d78257afc1. # Conflicts: # version.inc