Revert "Hotfixes, revert some changes"

This reverts commit b866e028b153f9314fb5782499d46359d089088e.