Remove static method
Fix for #938: make the old behavior available
Rollback Fix for #841 as it still broken in some case