Can Job Data rows created from Position changes not update pay rate from grade/step table?

We have an issue with a group of employees who are paid differently than the rest of our workforce. Their salaries are set up on a grade/step table but we pay them more than the rates on the table. They are also set up with an annual pay rate in the pay components section.

The issue we are having is when a reporting relationship change is done using Manager Self Service, when the position update automatically adds the job data row, it's either overriding the existing pay component row with the annual salary from the grade and step table for employees who are set up with a "salary step" source. For employees who are set up with a "manual" source, it's adding a second pay component line with a "salary step" source with the annual amount from the grade/step table.