Revert "Fix regression in LEAP"

This reverts commit fdac55097810dc2fcc7247a5fd309aa92be98f9e.