Revert 5e274a7..df07f72

This rolls back to commit 5e274a7bc48ca6dcc7a8beb2585aae5930c380d3.
Revert 850ba50..2d1b1cc

This rolls back to commit 850ba5089c5b768fff2542329afbcce0c0bbc54f.