Minor rollback and tweak to some changes, for performance.