PLXCOMP-282: Finish the job.