…ration state calculation""

The states has been correctly propagated and used. Original author had no
idea what he was doing, possibly because of some incorrect assumptions while
developing this fix.

/reviewed-on !587