fix regression of f7b71b2, remove ancient test and strange code, closes #1652