Merge "Remove PHP detection from entry points other than index.php"