Revert bb950a0..5403a4c

This rolls back to commit bb950a00c06352520f932eda5e693a77ac89760b.
Revert 5403a4c..2cbf59a

This rolls back to commit 5403a4cc71c160e8e809cfb347851c9212cdd6b0.