As we are reverting #696 in #2012, we need to investigate the original performance issue #696 had fixed.