This probably isn't even worth a separate commit