reverting c64d627559, 71232de1f, 47d6b9cd3, 5f9dcf5 and bea0505ea. develop such changes in a private repository/branch and push upstream once finalized and tested