oops, forgot to commit these as part of @6cc01f652267d4913399336858ae01917303a0a5