Revert "Merge branch 'targeted' of github.com:benjiec/xcms"

This reverts commit 7dd346a90e5dbaa33054f74d17c5a103e398f47d, reversing
changes made to 08f7dead68c8c1da18f699775628066eef2228ba.