Unborking the payments form chooser

Change-Id: If3b88dfd0e10b43e7c48dcdc41f1959928daee66