am a4ed15ee: Merge "Stop using the PLD macro."

* commit 'a4ed15ee1fb32039e38f4d8a5872c6910a9a9a0c':
  Stop using the PLD macro.