Paritally revert #359