revert changes from #480