Revert 4a06d1e..771311f

This rolls back to commit 4a06d1e8bbd829da31471d2dd48d28aeaf3e03ab.