Revert "Initial Hotfix"

This reverts commit bb1e99bcfde464b64882165fc9c21b0e27cf5f93.