Revert "Some blabla changes for 6.0.3"

This reverts commit 1561908f70e9181d18a86ab2ca979371cade4849.