Revert 0048f78..c66ce9b

This rolls back to commit 0048f78f44f3a8ac1d7325834c944a6df2f78e4d.
Revert 3d6af49..4f41a4e

This rolls back to commit 3d6af49807be5bc7bda68aa5e0e887b2a2778ded.
update