switch peacock hackery to fix all known issues refs #2685
Merge commit '901f0d806d9a57896f39d83aacabf96b2e6cfe4c'