Revert e750868..978675a

This rolls back to commit e750868d28bb39ee3cf19793b8d159b5272734e6.