diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh
index d9a9464..cf373f6 100755
--- a/root/tmp/setup/php-extensions.sh
+++ b/root/tmp/setup/php-extensions.sh
@@ -58,9 +58,9 @@ docker-php-ext-install -j$(nproc) gd
 docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
 docker-php-ext-install -j$(nproc) ldap
 
-# Memcached, MongoDB, Redis, APCu, igbinary.
-pecl install memcached mongodb redis apcu igbinary uuid
-docker-php-ext-enable memcached mongodb redis apcu igbinary uuid
+# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid
+pecl install memcached mongodb redis apcu igbinary solr uuid
+docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
 
 # ZIP
 docker-php-ext-configure zip --with-libzip
@@ -68,19 +68,6 @@ docker-php-ext-install zip
 
 echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
-# Install custom solr extension. Last release (2.4.0) is not working at all
-# with php72 and php73 and upstream has not either! Solution:
-#   - current master (as of 21th May 2019):
-#     https://github.com/php/pecl-search_engine-solr/commit/98a8bf540bcb4e9b2e1378cce2f3a9bf6cd772b8
-#   - this patch, applied already upstream:
-#     https://github.com/php/pecl-search_engine-solr/commit/744e32915d5989101267ed2c84a407c582dc6f31
-# So, following the experience with Macports, and https://bugs.php.net/bug.php?id=75631
-# we are going to try 2.4.0 release + macports patch. Old, but working right now.
-# References:
-#   - https://github.com/moodlehq/moodle-php-apache/issues/16 (part of the php72 image discussion)
-#   - https://github.com/moodlehq/moodle-php-apache/issues/19 (awaiting for a better solution)
-/tmp/setup/solr-extension.sh
-
 # Install Microsoft dependencies for sqlsrv.
 # (kept apart for clarity, still need to be run here
 # before some build packages are deleted)
diff --git a/root/tmp/setup/solr-extension.sh b/root/tmp/setup/solr-extension.sh
deleted file mode 100755
index 404b877..0000000
--- a/root/tmp/setup/solr-extension.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Install 2.4.0 release version + macports patch. Only combination working right now.
-# See #16 and #19 for more information.
-hash=6e9e097c981e810d452657f23bf1945b7955f3cf
-patch=https://raw.githubusercontent.com/macports/macports-ports/ed5c081eee78cbcc0f893cb845b20d9d98b3771c/php/php-solr/files/php72.patch
-
-# Download our 'tagged' source code from git.
-echo "Downloading solr extension source archive (${hash})"
-curl --location \
-    https://github.com/php/pecl-search_engine-solr/archive/${hash}.tar.gz \
-    -o /tmp/pecl-search_engine-solr-${hash}.tar.gz
-
-# Download patch
-if [ -n $patch ]; then
-    curl --location \
-        $patch \
-        -o /tmp/solr.patch
-fi
-
-# Extract the compressed archive.
-cd /tmp
-tar -xvzf pecl-search_engine-solr-${hash}.tar.gz
-cd pecl-search_engine-solr-${hash}
-
-# Apply the patch
-if [ -n $patch ]; then
-    patch -p0 < ../solr.patch
-fi
-
-# Compile the extension as required by a manual PECL installation.
-echo "Compile solr extension"
-phpize
-./configure
-make
-
-# Finally, install it.
-echo "Install solr extension"
-make install
-
-# Remove all the sources.
-echo "Cleanup temporary folder and files"
-rm /tmp/pecl-search_engine-solr-${hash} -rf
-rm /tmp/pecl-search_engine-solr-${hash}.tar.gz -f
-rm /tmp/solr.patch -f
-
-# Enable it.
-docker-php-ext-enable solr
-
-# Done with this hack.
-# Please, follow https://github.com/moodlehq/moodle-php-apache/issues/19.