Revert "ION: update to jb_mr1_chocolate"

This reverts commit 157a5d9ba0cef782214f74b0f2745306ec2fc187.