Reverted intrusive and messy propogator change in favour of a simpler fix.