Revert 2e84256..499fd39

This rolls back to commit 2e84256900b0febe7d1c0464f55e2203a57bb148.