Revert 4eda7da..5e9c8e5

This rolls back to commit 4eda7da5be8afd6dc8b1ed7eba6660d7d870b49b.