Fixed with https://github.com/silverstripe/silverstripe-framework/pull/2206/files#diff-66e7e67b0cc9214e33f8cec682407a20R536