Merge "Revert "Disable test while investigating.""