Reverted f6bbf09 because it screwed up RC