A second PR for (#3263 / #41)

Because I broke master while @pfriedman was merging #41, GitHub thinks it's branch was merged when it actually was not.

You cannot apparently make a second PR for a branch GitHub thinks was merged, so this one uses a new branch with the same ref.