Updated for 1.8.1 community edition.