Revert "Hotfix"

This reverts commit 64c652131de66cf2ca41465e59535c18d216bc76.