revert: partial change from #445