revert back to a33321a936f7

Should fix #36, #37