Revert "workaround for #1555"

This reverts commit 4b09c7a32c21fabea481dc560c4f9a564bb59205.