backing out 6e20300afb1187d11ffff6d19e16bd149543c922, it's broken, it's broken! refs #994