back to working version of OF2.1 vanilla