Revert d9ec798..fe5e82b

This rolls back to commit d9ec79876c60ac7930369f6050e98a5d08f53de5.