Revert "more -03 optimizing"

This reverts commit 73969273a9ae0360423327f280e05681564c0d54.