Revert 36235ca..33889de

This rolls back to commit 36235ca2fee41c0b42f1a3ef097abe270aca7f3f.