Revert "Merge pull request #2834 from andrew/thermonuclear"

This reverts commit e088c3d1150aaee0401adc5e1fbe0bb4d9c9d6cc, reversing
changes made to d124c0319d9aaefd9eb223db8db41f492a60ad0b.
Merge pull request #2842 from AndrewMeadows/master

Revert "Merge pull request #2834 from andrew/thermonuclear"