Revert 427a36d..804c6f1

This rolls back to commit 427a36d3e6ca52b71134a13e43915d242bd0390d.
Revert 804c6f1..98cdd09

This rolls back to commit 804c6f1666156fb5eb37c2e5e19341b7f7790368.
++