Revert and add a deprecated annotation here too