Revert 0-9 change, not worth the pain