Revert ae884da..f70da79

This rolls back to commit ae884da22797d94516495e7ff2bfc9a766d4d326.