Revert ff1d78f..38aa492

This rolls back to commit ff1d78f4e27c4430fc742e9301e2a70b743e33b0.