Remove code unreachable using Go 1.1 Upstream-commit: 63e8a4ac7441ac4af5ca8fdf05f44e9a8a7fc623 Component: engine