Revert "Broken entering/exiting on the scatterplot"

This reverts commit 29e014bfe4b8219edab1ce2ffd3cbae17db4f662.