w.holmes, Edward Caissie, I have update the post with a new version of the snippet and a reference to the recent changes in the WordPress core (as per ticket 19880).