Fix for issues #3931 and #3932

Created a new branch to clean up previous pull request. 
Good point. That means that the current implementation might not work. I'll try and make it fail with a test.

Besides what would such an equals look like? Interceptors will typically not have state so there is nothing to check in the equals method.