Revert a58ab23..ef52305

This rolls back to commit a58ab235f551b49a766684176e5f8820d2435079.