Initial backporting of moore-tornado. #170.