Proper Deprecation

Thanks @gorner for realizing the deprecation code wasn't working properly and even submitting a PR to fix it, with tests!