Per Sid's request.
@rspeicher Please review that I did not break anything, and then feel free to merge.