revert to using original expand method