Revert a997872..25e4269

This rolls back to commit a9978722a9354f597ef24c7543223d2c47d8bd02.