Revert 9efbd90..7031341

This rolls back to commit 9efbd90bbb5d69c9bcf68f4e4645737c2ff486c4.