Reversed commit 25d5a57