This broke one of our internal plugins during our last upgrade