Revert a3a4680..efff677

This rolls back to commit a3a4680dc6cd89c621105f8bd5e9207224833aad.