Simplified implementation according to issue. Refs #98.