Reverted options fetching to be 1.8 compatible