Revert changes in a previous commit

Revert changes in commit 9b3c31502317b5ce7e827f050c10e8f7a54f9151. It
wasn't working anyway.