Reverted workaround, see #43