Cherry-picked from myfluxi
deleted files