Reverting 101507f as it causes a build failure.