Revert 6b80cc0..c5e9cc7

This rolls back to commit 6b80cc03a7ae6c148cefee87ef22e41ae1946422.