Delete layer AND mask in ONE CLICK

Guys I'm going insane.

How do I delete a layer AND THE MASK in ONE click?

In the past, I was able to do this with the trash can button on the layers panel. Since....either 11, or the first CC I think, it changed so when I hit the trash can, it deletes the mask automatically and I need to click again to delete the layer.

I know I can drag the layer to the trash can. This is not ideal for the same reasons multiple clicks are killing me (I won't bore you with the details of sheer volumes of layers and intricacies of my workflow). I want to be able to delete BOTH the layer AND the mask in ONE click.

I've scoured settings and forums and have yet to find any solution to this. Please, PLEASE, does anyone know? This would literally cut my work in half.

Thank you for your help!!