Revert 301841b..8facd70

This rolls back to commit 301841b25a1cf922191f1299af9aa62273bb8fd0.
Revert 8facd70..f7d1f0a

This rolls back to commit 8facd70c6657915b580439eba0fba45888621f8a.