Noting #1306, 2b6c00d in 1.584