Fixes #962 - Not used anymore