Revert ecfe269..cb8bf75

This rolls back to commit ecfe2690928306a4eaa1d0fc685a3dee0191d3a9.