Revert the extend to use underscore.js