Issue #2851580 by oknate, samuel.mortenson: Re-order + remove broken with the Entity Reference (and File) widget
mentioned in commit ec94517b
mentioned in commit 277cc04d