--- old/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/LongSubstitutions.java	2014-11-20 14:38:50.000000000 -0800
+++ /dev/null	2014-11-20 14:38:50.000000000 -0800
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.oracle.graal.hotspot.replacements;
-
-import com.oracle.graal.api.replacements.*;
-
-@ClassSubstitution(Long.class)
-public class LongSubstitutions {
-
-    @MethodSubstitution(guard = HotspotGuards.CountLeadingZerosSupported.class)
-    public static int numberOfLeadingZeros(long i) {
-        return CountLeadingZerosNode.count(i);
-    }
-
-    @MethodSubstitution(guard = HotspotGuards.CountTrailingZerosSupported.class)
-    public static int numberOfTrailingZeros(long i) {
-        return CountTrailingZerosNode.count(i);
-    }
-}