Back out #212.

#212 didn't work properly due to an ubuntu bug. Will re-engineer and resubmit.