DON'T MERGE - demonstrate that #2543 is fixed now