Revert "core: Improve LPM support"

This reverts commit 26c151cdcc38755eb4cc56e7f1a3373834c318ea.