Revert "Bump to 2.4.1 + fixes"

This reverts commit c61f22ece51b3a2a8fed75d9c7ca5ea7f5754043.
Bump to 2.4.1
Updated sources