Revert "workaround for #277"

This reverts commit 64971e08cdc78b9eda59766012ae88d4ff8cddfa.
workaround for #277