revert AbstractPage changes

Revert previous changes