Revert fca3af1..ed5c8e9

This rolls back to commit fca3af1851d267cc1c94c00bd293a1d47ea811d1.