rolling back 907bf927c9631aba26dcb43b0101fc8159e2a4c7 (closes #140)