Remove hotfix since it is now included in core