Remove stinky code, ref #287

Tests show that this code is not needed any more.