Revert suspiciously behaving code