Reinstate stopgap for now

On further analysis, I'm not sure what the bug is here so I will
leave in the stopgap until is more thoroughly analysed.