Rolled back #72 due to issues in pdoMenu.
Version 1.9.5-pl1