This reverts commit 030f9ee4e7, reversing changes made to 1555241393.
030f9ee4e7
1555241393
15552413
L3 lands again with two fixes: a held module is never removed, and the grants cover L3's new subjects.