Revert "PageModule remove returnable behaviour"

This reverts commit f03726a9d444488029bff4b04bb41419b7cdcaae.