Removed this for now until we can find a fix (Dmitry please look at this)