Remove old double-chest detection code and use the vanilla approach. Fixes #914