I read somewhere - might have been here - that a solution is to not remove leaves, but move one or two of the short leaves from the bottom of the stack of leaves to the top. That way they don't function but the same retainer bolts can be used. Have not tried it myself.
