Fix unwanted interactions with entities since commit 041227d9.