Revert "hack fix for #300"