Revert "PHOENIX-1533 Last key part not taken into child/parent optimization"

This reverts commit 62b12d99d44f52e539aeb291e84102be99b6e5cf.