switch peacock hackery to fix all known issues refs #2685