Revert the theme.inc patch

The last patch to theme inc should probably be reverted as it changes the behavior of the theme_image function and also requires core (system.module) and contrib modules (image.module) to also update their 4.6 releases. Just to be clear, this patch should stay in HEAD.