revert invalid code-reuse thingy