Recommit my changes to EditPage without the regressions: