partially reverted a previous merge (closes #206)