Reverting changes from #89