Revert "Broken cap is broken"

This reverts commit 5bdcc6d38a35be9cad7ff5e1b3cce1d5b224c04c.