Revert "Remove unused code"

This reverts commit a7ddafbe1d74ce25ef0168e7f5746f03ad084b80, and
updates the TODO comment to remove the code if/when Julia v0.3
is required.