Revert a6dac04..bf436ba

This rolls back to commit a6dac044435a1493e75f3b8753da57a21e135b9d.
Revert "Revert a6dac04..bf436ba"

This reverts commit e224932d14cae8029f2cffbfe838330d737e0f23.
Revert a6dac04..60157c5

This rolls back to commit a6dac044435a1493e75f3b8753da57a21e135b9d.