Re-attempt fix in 37cf9cd.