Revert dd845d6..f71768f

This rolls back to commit dd845d6db446fddf4e62caa25a9a08782125da49.