Revert eab0455..6169a0a

This rolls back to commit eab0455e5407682b1f1a324bd432eac5edabe225.