Drop further unnecessary requires

Change-Id: Idd605b0017db654fe629a80aebb85523e2e7b528