Before fiddling with the code let's put in place a test covering what PR/gas 16908 aimed at.
mentioned in commit 22a8433e