Revert e23d773..6432e04

This rolls back to commit e23d773b58783bdcd3a8e0d39461523e9cf00e95.