Revert 9d9c820..afc9edd

This rolls back to commit 9d9c820cbd9f6fc91619cf765730b0d58dd41fb2.