Reverting last change due to performance