Revert f434f4a..f691063

This rolls back to commit f434f4ae8bf4ad3d3d91192ab1f6f2ff3462ff92.