Revert 6f57c3e..f8b6346

This rolls back to commit 6f57c3e6e6e6f614fed6bba4bd62d339c9086e0a.