Remove old double-chest detection code and use the vanilla approach. Fixes #914
Merge remote-tracking branch 'remotes/upstream/master'