fix: revert now unneeded workaround