Revert "fix #902"
@apprb #932
This reverts commit 13306031e238258a3faf2909a01987cf093765dc.