Revert "removed: workaround (no longer needed)"

This reverts commit 563780067bf6715e014363e603ff3ef5bd457d46.