Revert "migrate jaeky's code"

This reverts commit 8db5249dd56f1a7ecbdb624f3132be90a8632f73.