Revert "Hotfix to ensure backwards compatibility"

This reverts commit ee6b78189500bace8f472bc4330235948f0e12f8.