This reverts commit 5ead5e9c90. part of this commit is reverted as most files shouldn't be world readable
5ead5e9c90