PSDLE - Breaking promises.

Sync with master: 9ef1bce8c0a678a897a93fd67c722b6e659c768e