Revert ""

This reverts commit b88d1f00f7a5e471df5e746db432fd38070461ca.
Apply PMD