rollback of #204 fix