These should both work now. Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Part-of: <!20446>