Remove the test for the root user, effectively reverting part of