Note to Todd: see why this is necessary. Is there a test that relies on this for success?