Issue #2515080 by Dave Reid, jenlampton: Fixed embedding files if file_entity does not yet include the fix from #2365821.