Changes to this file are actually for #1487