Reverted back to old perf.