Revert 5327b14..573b590

This rolls back to commit 5327b14b7d343c9295e554b1437910425f46e9f9.