Revert f74a484..735a437

This rolls back to commit f74a4848b8b3c092c4d6cdfabbf679eccd7d0934.