Bug in Rake, reverting

This reverts commit 0b02d8f8be926fcfd6a5914f234e6ff21880220c.