Merge "Revert "Added some constants to speed up Setup.php""