Revert bc42a71..40afbb6

This rolls back to commit bc42a71a24753f20872e3ad3415bcb55fb1024a7.
Revert 40afbb6..894a0b1

This rolls back to commit 40afbb655d959c1c2323226a6333a2ef24f85621.