Removed confusing preprocessor conditionals for HR25.