[PATCH 0/1] MR525: deduplicate code