removing Shameless hack to deal with issue #368 which is fixed now