Revert 33d269e..09e92c3

This rolls back to commit 33d269eed894c60c41aaca2e8f566b396f26be32.