Revert ecc5152..a6ac773

This rolls back to commit ecc5152313b2a0be51505eddf4dd5950db5ddf69.