Revert bbb91a0..b069d93

This rolls back to commit bbb91a0c450a4f228f2e0c1e121d47d511a61609.