Revert "workaround"

This reverts commit b3af32482217e508a20674e757fe090d7d78d9c4.