Apparently I forgot about all the old code in MASTER when doing the
merge from lc-1.7. All fixed now.