Remove WIP as bug-1104649 is resolved.