This reverts commit 03bc2064183f0574a1c05d8d0b50c67cd7416e22.
Please explain the detailed changes you made here. Reference any issue number this pull request fixes.
@authors
@richardhj pls check travis