Revert "Fixes merge clobber"

This reverts commit 1bcc839f0b99d314515d5b9718b0656d01ebb0e7.
Fix "All" option being shown multiple times in grade filter