Added PROV-503 again. Somehow this piece of code got removed in one of the last revisions.