[#2131] Furthering the excellent permissions changes made by @sprain