(#1826) - Reremove es5 shim + extend from alt branch