Magic fd round 2

#876.  Previous attempt is causing new problems of its own, this is what we should have done.