Revert __.extend() Fix