remove offending code, final fix for issue #364