Restored to upstream 4.6 version