Initial port from 2.3 or 3.0.