Adding back the orginal filter content to offset problems found by Fabian.