Revert 1c793c6..9f04839

This rolls back to commit 1c793c66f54a4081ea5e7fb1eee6581048bace40.
Revert 8529507..61f108a

This rolls back to commit 852950739c314ee3d22669a3b345684354f531a8.