Fix merge fallout, killing validate
Fix merge fallout, killing validate

Signed-off-by: Austin Seipp <7ea35d812706d9213868749011af1ed4fa2f6aa0@well-typed.com>

hferreiro/replay,lukexi/ghc-7.8-arm64,lukexi/ghc-7.8-arm64,hferreiro/replay,lukexi/ghc-7.8-arm64,hferreiro/replay,lukexi/ghc-7.8-arm64,lukexi/ghc-7.8-arm64,hferreiro/replay,hferreiro/replay,hferreiro/replay,hferreiro/replay