This partially reverts commit f459e43dc9. Signed-off-by: Daira Hopwood <daira@jacaranda.org>
f459e43dc9