This partially reverts the unwanted changes that crept into c13a48e74e Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
c13a48e74e