Revert a1f12c0..d55d9d4

This rolls back to commit a1f12c05251cee1b4ee6057a3902fedb9882403a.