[v 1.0.4.12] Revert menu creation back to original