Revert "fixed context Notes parameter bugs"

This reverts commit e3399135b0af40e9cf15c44abceac34495622148.