Revert 584832f..b8b9c84

This rolls back to commit 584832f534600aa7ffda3e4e4285b1210e402c09.