actually commit hijacks
adrake's and skishore's hijacks
removing more
Merge ../dropblox