Revert part of commit aa1fe55fe5a79836bca66da17bb7c34c1dcede45