MessageProperties -> JobMessageProperties change reverted

This reverts commit 2f74d6ef4e9bf5567557bfc384ec4039a0d2aae1.