@jamesgorrie See commit 058a8d4