Recommit due to page build problems