revert changes made by #4205