Revert 36b7a19..2fad06e

This rolls back to commit 36b7a192db0102330d217bd0e020c873e6bc87dd.