Revert 3fb417a..d941556

This rolls back to commit 3fb417aeab140d6c206fd07f2416b47089b14622.