Revert 0831a9b..f19c260

This rolls back to commit 0831a9b04f5f28c2cf0e90baa98d3e2202a8ea9c.
Revert f19c260..9a4c22d

This rolls back to commit f19c26032f2529be2015546b40f6d586dbfc0b19.