Merge "Revert "Suspend test until fixed.""