Revert 3334bf0..f3eddb1

This rolls back to commit 3334bf00f6972f110aac28f9031f2ced5eb1baea.
Revert ce6bf39..12501a7

This rolls back to commit ce6bf3936ec25078ec5452bc14194dd71ca96210.