Revert edc260a..f423090

This rolls back to commit edc260a9ede377b06d8f59686cc3f50ba79bf5ed.