30b873
remove previous patch for now, it issues several connection problems - #1621949, #1620114 and #1619240