Revert 65290bf..91a8425

This rolls back to commit 65290bf854ed4083534e9db0b4d4ce537889a178.