See #2269