make steps not DRY to get around dumb ChromeDriver bug

Change-Id: Ifc21c4fcd3c9adbfc1ec9d0ed386313c1dd36d5c
Merge "make steps not DRY to get around dumb ChromeDriver bug"