Merge "Revert "Let install.php detect and inject extensions""