Revert mistakes of 3.x style.