Revert "workaround"

This reverts commit 7cf5cc37e524e8e20438636b5bf9cbecfd253a83.