Revert 2372dbd..9a86442

This rolls back to commit 2372dbda4cc63204cbe717c5b883720dc49a2a1e.
Revert 17a2d88..86583aa

This rolls back to commit 17a2d88fc8fce693233bceabf5aee40bc9bee3a1.