Simplify GENDER handling

GENDER can be used without a parameter for the current user, so the
code that adds the parameter can be removed.

Follow up to Ia3e3f338f0861434251c137b6dd8e097f9c2d92a

Change-Id: I1c7875d1c9cb1b092b82ec266abb146fd42b9328