Reverted scalac options code