Reverted due to two distcint performance regression reports. This reverts commit 92c1fd19ab.
92c1fd19ab