Reverting commits after finding the real cause of the issue!