Rolled back some code

to deal with the static frames allocation issue