fixes #1748 as that half of the fix for #1332 appears to have been an overreaction on my part.
as a (hopefully temporary) workaround for #1332
Signed-off-by: Timothy Gu <timothygu99@gmail.com>