Revert 9dd3f60..7cde3e8

This rolls back to commit 9dd3f606d017cf6a1059a6a89c602729078555d3.