Fix permissions but now with less suck

Change-Id: I7cbfcc55bb4dc1159c03bbdd0a9669dbc68909dc