More forward-compat way to accomplish f7955522c45a