this class must have moved
Revert "this class must have moved"

This reverts commit c0ec0c81b17088e0886e99ac667303c11e300c6b.