Backout 566c01fe0d98 (bug 330879) due to unexpected regression
Bug 754265 - Add a dedicated API to provide a final complete value different from the matching one, r=Enn sr=gavin