Merge "Revert "Disable test after failing test was pushed.""