Reverting issue #19. Need to undeprecate functions due to changes in core.