Merge "Revert "More neverallow rules""