Revert 13b03e2..58ec5cc

This rolls back to commit 13b03e245416a0837fc3740f330802ff59190fc5.