Revert "Clean code base, break permissions"

This reverts commit 8744d31c9bce42685d9c26060c0425e824e7223f.