Revert 44c4144..793b702

This rolls back to commit 44c4144e028cea380ee70548b15086149ac5a7ac.