Commit the buggy intel workaround as requested