Revert 9582284..e7324d4

This rolls back to commit 958228492899a5bb54a06526d5fa4e676f7f7d6b.