Patched (final?) ENG-4907.