Revert "Fix https://www.pivotaltracker.com/story/show/77982108"

This reverts commit 6aeaf923039e092c5bd37a722b2bba8f351b0a2e.