Merge "Revert "Disable test after failing test was pushed.""
am: 2b8624cf94

* commit '2b8624cf9487e9dee3b817833499564b627248c4':
  Revert "Disable test after failing test was pushed."