Applying patch for 25ns Dec 2012 runs

@mcepeda, @pklabbers
Allows you to retroactively configure for some 25ns runs from December 2012.
-1
Drop the cout, please.