Revert 49fefb7..dd966af

This rolls back to commit 49fefb7d22b92849902605384a666aac9c19dc18.