Commit Neil's patch reported here: