Revert 96e8682..bfa780e

This rolls back to commit 96e8682d36ac4e8328bad837074400fffcc2ae9c.