Revert 09089c0..7b6d580

This rolls back to commit 09089c059f573c3773480378d2faab15cd771059.