Last Commit Conflict Fix

The last auto-merge caused some conflicts between two different
versions for some reason.