Reverted 5.4 enhancements on requirements checked to be able to run it on lower PHP versions