revert part of commit 3bc71b320a7d24de865099d92f02f466633b883a