I find the original semantic a bit suspicious, but someone should really double check this commit and revert if needed.