Revert 1389809..8bf4ae0

This rolls back to commit 13898091ae885ec95853a94bad4bdacb098f4ec9.
Revert 773781b..3a84cc4

This rolls back to commit 773781bc89654c06ae41ffe919492d8c55bb1f4f.