Revert "Revert "Stop using the PLD macro.""

This reverts commit c7cf6f623954a672a34b9bc856cdc176ad8b2f9b.