Restore simpler deprecation formatter fix

Given the implications of #968 this restores the simpler fix from #966 and #967 which whilst not perfect, should have virtually 0 side effects. The aim being to refactor the formatter/reporter relationship for RSpec 3 anyway.