Revert "Please check Issue M-400"

This reverts commit 84e4f5597ebbb5a81f443bd2899c8556d058952b.