This reverts commits 81bec3e5c4e559cacadbc07dd24aac8d5099caa6 and 157f5c3304e8b85be8ada99a634393ea22e45045.