PAHMA-1138: ...and now the rest of the code to support this change.