Applying commit ff80f52)