This handler won't be necessary when my initial comment is implemented