@tomo , feel free to check and merge (it requires manual step: prepare Apache2)
This will create a new commit in order to revert the existing changes.
