Revert 56486d1..ef104e8

This rolls back to commit 56486d1ebe53fa8d6d796e9647c537e2aeff5a22.