revert changes of 3.1.2