Is there a reason for undoing commit 40c315b5?