Revert "Current page used as base regardless of Base Item setting"

This reverts commit e846639776acfba2ffa5074afc00134ecbce53da.
Revert "Revert "Current page used as base regardless of Base Item setting""

This reverts commit 4f97b61d3d1a2cfbf810ea1fc3e292e93f783c4b.