Avoid requiring fixes like e054a3cf3a, since these are separate packages which happened to have a source file in common.
e054a3cf3a