Commented out old e17 patches.