Looks like we need this after all! Oops.