Hotfix: Revert changes