Won't this cause a failure on non-RH systems since it will now return false?