Pushing so I can pull a fresh copy, hopefully without this bug that only I get.