The main goal of this is to check if we should keep supporting older distributions.
/cc @tomo @jm
This will create a new commit in order to revert the existing changes.
