Fix #198 back out original optimisation as it masks application errors.