Revert "GPII-364, GPII-365: Better version of expandingAdjusters. Looks good except the hacky parts of function() selectors."

This reverts commit 3deab69683c000be0e23e6e846ddbdaa9622759c.