Revert d0b0b18..2267e1c

This rolls back to commit d0b0b1808d4e8bb523a7d8037b5359d66a94259b.
Revert 2267e1c..ca604dc

This rolls back to commit 2267e1cd7406efc1b251955a106948374ca95f3c.
NONE