Revert eedb9cf..1e1ad04

This rolls back to commit eedb9cf66aa728e9cca091821a8ecb466b4f4571.