Revert last change until issue reported by Owen, won't be fixed.