Revert eedb9cf..3873d3b

This rolls back to commit eedb9cf66aa728e9cca091821a8ecb466b4f4571.