This reverts commit 3da93e2bc2fceea3aa5528e915a19417c6a75e60, reversing
changes made to e264f9ede72956ed5d28dd5d7789209fdbcfca74.