Reverting back to 8543af59326a596a1320e1d5c7ee717143c91f01 (closes #4)