reverted 3.0.63 changes in order to fix compile errors