Revert "Pla: redundant manual types removed"

This reverts commit faf1a25eef9227b8cadd8b2504f3e5c80251f6af.