Revert 4667a35..431c68a

This rolls back to commit 4667a350b12c1823788d96f7c0de1ab16b41bbc8.