Revert d3cbdea..4f0cce6

This rolls back to commit d3cbdead06547e4e80ac267c59f57d151f27d8f5.