Revert 011c32d..d6412c8

This rolls back to commit 011c32de2b7918d0d302b81731dad88e230ae8c3.