This is the function that would address #1849.