Bug 915730 - Forgot to commit some updates to capture.py when tweaking;r=gbrown