Revert "Revert "Temp remove -03""

This reverts commit b4d1b3b7f3b0e192955dba2db59a4a97a02d471b.