Temporarily reverting changes from #147