reverted changes to context builder