Bug 1019891

See new commit ;)