Revert 001b806..8d0d0aa

This rolls back to commit 001b80615d0f8dadfc864b8ca1b92e4fc617bd0d.