I've justed removing this code in #3031. Afterall, I'm the one who added this special case. :)