Closes #1006 in 3.0