Remove the changes in 2014-10-26/sc which cause a performance regression in some cases

Remove the changes in 2014-10-26/sc which cause a performance regression in some cases #387