Revert PMD fixes