Revert previous change - doesn't cover all cases.