diff --git a/component/pygolang/buildout.cfg b/component/pygolang/buildout.cfg
index 94a477e539339fac4b6965df2dfa40f4e54181df..ad2e71e67a5407e37c22af7348011cef2be27ec2 100644
--- a/component/pygolang/buildout.cfg
+++ b/component/pygolang/buildout.cfg
@@ -37,21 +37,9 @@ interpreter = python
 # interpreter code that buildout generates cannot process `-m pytest --<pytest-option>`
 # -> use pymain from gpython to workaround that.
 initialization =
-  # minimal support for -O argument.
-  if '-O' in sys.argv:
-    import os
-    with open(sys.argv[0]) as f:
-        executable = f.readlines()[0][2:-1]
-    sys.argv.remove('-O')
-    os.execve(executable, sys.argv, dict(os.environ, PYTHONOPTIMIZE='1'))
-
-  # set sys.executable to self, so that subprocess and friends go through us
-  # and this way spawn children with correct sys.path where all eggs that
-  # parent have are present. TODO consider migrating this into pymain
-  sys.executable = sys.argv[0]
   # tail to pymain
   from gpython import pymain
-  pymain(sys.argv[1:])
+  pymain(sys.argv)
   sys.exit(0)
 # don't install scripts from listed eggs (avoid conflict with other sections
 # that use zc.recipe.egg with eggs overlapping with ${:eggs} - ex neoppod)
@@ -62,4 +50,4 @@ scripts = ${:interpreter}
 
 
 [versions]
-pygolang = 0.0.7.post1
+pygolang = 0.0.8