bugfix: remove workaround