@vicb merging this in as-is. Please create an issue to bring this up if you still feel it's necessary.