Reverted #4098.