Revert "Bug 13."

This reverts commit 11425528e9561f7ffd8e0c650e126a381a9eb096.