This is connected with the issue you described here. It is addressed here, and in subsequent commits.