Revert "workaround for #277"

This reverts commit ef2087b379da2351e4054f6099944833f024b39e.