Revert f9dc9b8..26644ba

This rolls back to commit f9dc9b8369b1ebc4aaf059c22e26782e54665785.