Revert 715f2c4..2857257

This rolls back to commit 715f2c4edb451e64a80348dc95075bff06a7d94c.
Revert a376584..53eb596

This rolls back to commit a3765848794e77db490544897f6a68280aea4e5f.