Revert a40a625..c017463

This rolls back to commit a40a625615c22eef3e49a7dabd62996bff8813e2.