Revert d646ead..a26721d

This rolls back to commit d646eadaba53365a526393bb974282f5d847329e.